Minor refactoring
Add TODO