I saw the your code and thought ...

After reading through this I through these non functional changes made things easier to read.