Cleaned up class.