Code review

Hey Lauren, @zachallaun and I are doing some pair code review :)

We've just started, so we'll push a bunch more little commits as we go, plus commentary in this pull request.