took away unneeded && in while loop