Cleaned up some checkstyle errors
Cleaned up some checkstyle errors