Cleaned up classes
Cleaned up class