326a762e25
Pure refactoring to make the code easier to read. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>