Tired going to bed, slight changes

In the process of ruining perfectly good code for the sake of some
other idea I now have going to sleep on it afore I go to far.