Simplify code a bit by using just the time