Changed variable names in year for better readability