refactoring java config + checkstyle corrections