cleaned up class