Change inner classes to be static