Cleanup, reformat, and Mavenize