Tidy up code and make options for both erb and haml before ex5