More aggressive timeline simplification and code refactoring

[stalomeow]

Will remove as many empty items as possible.

[BenderBlog]

You may edit your code directly in this repo next time....