Refactor outlets