Changes after Code Review