Java code properly indented, working on naming conventions next