moved current year calculations into methods