A little refactoring for clarity