addressed remaining comments from @dmose