cosmetic changes on fix for #305

I felt weird about the previous style where things were more
intermingled. Does everything still look okay?