Need a commit to reformat all of these files to our style (two space indent, one liner javadoc, etc.)