little refactor on due date