Code review!

Hey Brian!

These are things that I might change. I recommend going through the commits in chronological order instead of looking at the overall file changes.

I invite you to be critical and ignore changes that you disagree with. I'm happy to explain the thought process behind any of them.

Cheers,
Zach