More inner classes converted to static inner classes