Make some inner classes static