Today refactor