Refactoring slots