some clean up in the offset method