Cleanup of the code: Transitioning to class-based views