Add calc_Ekin
Simplify Ekin calculation
Use a function
Optimize further