Renaming classes and remove useless comments