Timelines -- minor cleanups.

Small style fixes and refactoring while reading through this area of code.

Please, review!