more Java, refactoring + renaming