Cleaned up class template.