Partially Done with Checkstyle changes
Fixed almost all of the checkstyle issues