Code cleanup
Thinner timeline