all tests pass
minor cleanup