Modified HAML and add comments