First pass at formatting and checkstyle fixes.