General code cleanup, please excuse my mess.  :)