More clean up
- put the ball elsewhere for no confusion
- Better descriptions of the todos
- remove a non used function