Minor refactor, sped up timer.