Refactor stick #1