Kinetic Energy added to DataHandler. Some code cleaning