Ignore finder junk
Made code a bet prettier
Simpler while loop