Clean up haml code a little