Add data cleaning.
Adjust for test_CLI.
Init. commit.