codestyle, part. refactoring