Incorporate feedback from GPS's code review