Fixing some comments.
Removing timer and using scheduler instead.