Comments and spaces added