Completed a little refactor.