Your proposed modifications sound good, be sure to attribute credit to each change so it is clear what work is your own in your final submission.
