responds to code review

all tests still pass (though I removed some because I removed those APIs YAGNI)