reworking of dates, strip spaces