Cleaning of the code
DataHandler and NNModel OK