Post updated with some of your suggestions as well as some from @jgrahamc Thanks!