making some mentor-suggested changes