Cleaned up the heirarchy