Refactoring for Non-equilibrium Calculations

I passed the midterm evaluation, Next i have to refactor part of code in vaex which is used in non-equilibrium calculations.