I think your "rough draft" looks pretty good to me.