I was thinking it is easier to read, anyway, took out the repeating logic