Reindented ZDate as suggested by rubocop
Used -= instead of longhand subtraction
Used + instead of += where the result was not needed
Used && instead of `and` where it was not needed