Commits
Michael Gottesman committed 6099702789a
Fixes requested by Jordan when reviewing 389238e801db7b0c027c473787caf0898d37151d. These were all small fixes suggested by Jordan. All of the changes are cosmetic except for 1 removal of a sort that was not needed.