cleanup + fixes for haml