address review comments for #23