Add better tabbing and haml