- small changes based on review comments