pre/post install refactor/fix