Comments and style fixes