code review comments addressed, tests all passing, hurrah