Removed some checkstyle rules, formatted code