(QENG-807) Code, doc, and rspec changes from PR feedback