Improve comments
Doc strings are better not in the header.
Add some class doc strings