Preparation for a refactor