[NUCCORE-1112] More minor refactoring