cleaning up some general comments