addressing comments, fixing names, magic numbers, and wiper logging