some cleaning up comments