JMs comments & further tidying