Comments app + codestyle changes