Made some improvements to the code.  Nothing major though