Cleaned up some checkstyle errors
Merge origin/master