refactoring
TODO list updated