Comments and minor cleanup