Preparing to refactor