Refactor and cleanup in datatools and scripts