Cleaning up code slightly.
Merge branch 'master' of github.com:mermop/rabid-christmas-card