Cleaned up class object