cleaned up classes