minor refactoring and date changes