Improve comments as per @fwenzel's request ^_^