Rearrange code to make some logical sense.  Seems nice & clean.