Cleaned up some classes