Moved inner class definition to bottom of outer class definition.