Apply format, first pass at checkstyle