(Issue597) Changes from self review