major cleanup for the cgc page