minor refactoring
TODO list