Made expiry column generation more concise.