code cleanup
Class-based views, just for a tests