Data clean-up first draft