#496 Improved comments