promoted more inner classes to be readable, result: uncompilable!