Final updates to the format and checkstyle so that the format matches the style.