#268 Minor documentation and return logic