minor refactoring, add a TODO