Refactor code
Run timer every second
Run timer every 5 seconds
Merge pull request #6 from mycardboardbox/refactor

Refactor