Apply formatting, first pass at checkstyle