Just a little refactoring...