misc refactoring, changed mlups computation principle