Minor re-ordering for brevity
Merge pull request #1 from Duta/patch-1

Minor re-ordering for brevity