refactoring: minor cleanup, experimenting with Checkstyle