Include checkstyle, and start work on fixing formatting