Changed the interface to the static variables. Fixed some checkstyle
warnings and got rid of dead code.
Fixed logic problem
Stupid checkstyle
Merge pull request #230 from mrathjen/mMaster

Changed the interface to the static variables. Fixed some checkstyle