Cleaning up and organizing classes (OOP)