Cleaning up class