Minor re-ordering for brevity