removed the redundant inner classes