misc refactoring
misc refactoring

NProfileAnalysisComputationalTool/npact,NProfileAnalysisComputationalTool/npact,victor-lin/npact,victor-lin/npact,NProfileAnalysisComputationalTool/npact,NProfileAnalysisComputationalTool/npact,victor-lin/npact,victor-lin/npact,NProfileAnalysisComputationalTool/npact,victor-lin/npact