Refactor and move the date between into it's own class of extension methods