(refactor) Minimally better, still ugly
Merge pull request #59 from bethjohnson/master