Style improvements

Done along with @mollymcleod!
It was, but I'll toss this to @mollymcleod.