From comments on first PR : clean comments.
Cleaning up.