Small refactor of the ticker
Merge branch 'master' of https://github.com/DanielKeogh/SettingThingsOnFire

Merging changes