Cleaning up classes