Fix up comments