Nitpicking, can we move the Time.now into the next line and drop the else?