Addressed concerns voiced via code review - thanks