removed todo
added comments