little clean up for packaging?

This could be packaged into http://marmalade-repo.org or some such? The patch cleans it up so it's possible.

Do you want to upload it? Do you want me to?