Added year increment, decrement as well as refactoring