Making changes as specified in Code Review