Change inner class to static

Inner class does not need access to outer class