Refactor otherdates