Minor cleanup to improve pythonicity
Merge pull request #28 from MikeDelaney/reorg

Minor cleanup to improve pythonicity