simplify edd, dod datetime maipulations
cleanup conditions, refactor
tiny refactor