Refactoring

Signed-off-by: Ladislav Klenovic <klenovic@nerdrobot.net>