improved code hygiene according to comments

Signed-off-by: Ondrej Koch <o.koch@zerusnet.com>