Cleanup, adjusted line-rate calculations