Comments and minor cleaning