Apply formatting, start to fixup checkstyle warnings