updated todo
Removed else clause