Refactored date presave