views refactoring, decorator simplification