Made some efficiency changes, plus it makes a little more sense.