Slight clean-up.
Initial Refactor
Merge pull request #1 from nsmits/master

Pull for Refactor