added todo, fix indent