@layam implemented these suggestions - look good?