Fix Codestyle violations