Added dateTime validation and corrected double validation. Shortened code.