added some TODOs for refactoring
whitespace cleanup in CleanDataSet
removed function from class handling as it imports a module