cleaned up class tree