Minor refactoring.
Merge for unknown reason. Need to investigate.
Merge branch 'master' of https://github.com/HatStephens/takeaway