Pull request feedback.
Merge pull request #29 from rseanhall/cleanup

Pull request feedback