Haml-ified the right way this time