Make changes after code review