Checkstyle added and cleaned up
Updated checkstyle.xml checks