postprocessing modularization and add unitest