made it a little cleaner, more tests pass