Cleaned up classes for submission.