Changing to static inner class.