Cleanup

kalehv pointed out that else wasn't necessary with the while loop