Refactored for sr/main/java