Fix up comments after reviewing everything seems to be correct