comments added on HAML refactoring