Switched to haml, cleaned up some code.