Eclipse checkout. Applied Organize Imports. Fixed instances where static is referred to through an instatiated object rather then the class.