Comments and minor polishing