Cleaned up exports and DateTime-Year arithmetic