Cleaning up class variables