Simplify steps dealing with dates