Rearranged for readability.  Removed commented out line unlikely to be used. Added suggestions as comments.
Merge origin/master