Coding style improvements (issue #1174)

Signed-off-by: Michal Čihař <michal@cihar.com>