cleaned up a lot of extraneous comments