to haml and some other changes