Did some code cleanup before taking the compiled code out of Eclipse.