Further haml-izing mostly