#387 Improved comments