Changed the interface to the static variables. Fixed some checkstyle

warnings and got rid of dead code.