Change the way expiration happens and add logging

We had an example of upload expiring in less than EXPIRATION_IN_HOURS without a really good reason why, this also logs the expiration date and uses .hours explicitly