Modified expiry years to start from present year

Also touched the function 'soon' ever so slightly to keep it DRY.