Clean up some formatting and checkstyle problems