Refactor plans