Doing some Code Cleanup before taking this mod outside of Eclipse for
testing.