First round of code cleanup has been finished.  Also, Java version is
set to 7.