Add refactoring to todo