Renaming
Unused class deleted
Class readability enhanced