Improved guide formatting