Setting up for refactor