SCISOFT NCD: minor code refactoring