Cleaned up a bit.  Still may tweak the look and feel.