cleanup code and allow for 1 future year