doc: Improved guide following Aaron's suggestions