Last 3 suggestions by jreback will squash into previous commit shortly