Sample pull request :)

These are a bunch of mostly-cosmetic, object-ey changes. I'd love to get a code review of my code review :)