#27 Codestyle changes, one bug fixed