post run refactor