actually adding refactoring to the TODO