some timeline cleanup (especially method organization)