Switched to Standard Java Coding Conventions