clean up comments to be more concise/uniform