SLICE-91 small refactoring