Fixed: Java 1.6 errors
Fixed: formatting changes
Fixed: formatting changes