(1) I made some minor changes.
(2) Looks fine to me.