Make expiry a bit neater