Small refactoring removing slice calls