Slack refactor