Cleaned up all Java code ahead of refactoring, new features