Made innerclasses static where possible

Findbugs suggested these to be fixed.