Removed todo and modified the documentation