Make changes based on Github comments