Formatting, first pass at checkstyle