Formatting changes
Merge pull request #42 from lararennie/label_fixes

Java codebase cleanup.