Fix for all the checkstyle issues so we can run checkstyle inside of eclipse