imporved comments and updated names re. conversation with Trevor
imporved comments w.r.t. review