CLEANUP extracted inner classes - removed sep rule