More cleaning up comments