Refactor to use a shaped object
whitespace fixes
Remove old timers
0.6.0