- renamed classes
- removed unnecessary code