Refactoring suggested by Slice