Set the inner classes as private and remove comments