Here's my feedback in the form of a pull request

Skype me after you get back from Cancún :)

You should check out the individual commits I made, as the overall comparison is kind of useless.