Refactor slots