Cleaned up the code. Removed/resolved a lot of todos. The timers
apparently don't need to be tuned because they have been working fine so
far.