Converting inner classes to static inner classes