General cleanup. Also added travel length to reset method.