Improve Performance for Inner Classes

Declaring inner classes non-static causes performance issues due to GC at Java. They should be defined as static wherever it can.

You can see related conversation here: https://stackoverflow.com/questions/20380600/gc-performance-hit-for-inner-class-vs-static-nested-class