Some modifications/refactoring (erb -> haml)