Make changes based on PR code review