Fixed minor errors
Reformatted all files to use Java Coding Standards