Cleaned up classes