Improved doc comments in the main sample