small form edits and tests pass