Removed todo, added commentary