Code Refactor

Changed code to use DateTime helper method