Cleanup views using helpers