Change inner class to static