Comments and minor style