fixed minor pr comments