Better use of CBV