SLICE-9 Small code refactoring