Make changes to reflect discussion on github