[#51] Clean and format more like haml