Haml refactoring