Rework according to comments

Signed-off-by: Robert Varga <robert.varga@pantheon.sk>