Mostly superficial changes

I cleaned up some code as I was reading. Mostly just took out redundant if's and replaced some examples of 'x > y - 1' for 'x >= y'. Some of it is personal preference so just reject if we don't like it and I'll rollback.