A little refactoring of post processing