Cleaned up code

Signed-off-by: Ondrej Skopek <skopekondrej@gmail.com>