Commit Two

Tidied up a bit.  Nothing dramatic.