add and clean up comments