added todo comment
removed whitespaces
Merge branch 'reorg'