[ issue #6 ] Checkstyle settings and... subsequent refactoring :(