baseline refactor