Refactor efforts