Add another little refactor to have a more declarative code.