Apply code formatting, start on some checkstyle