Refactor timestep rescaling

* Move more error checks etc. into function
Un camelcase assert functions