A little refactor for clarity of flow