Small Cosmetic Changes

Made a few small changes to the class. Just pushing it up so we can
synch other work.