cleaning up comments features complete