Simplify time management a bit