Data clean-up first draft
Merge pull request #9 from jamesvanmil/data_cleanup

Data clean-up first draft