Some improvements and reversions back to some of the original code in certain cases where it seemed more sense.  From either a code review point of view, or where my OCD caused me to unnecessarily rename something