Cleans up for pull request

Apparently I have a lot to learn about how to submit pull requests.
Just did a bunch of back and forth commits and reversions for nothing…