Some minor updates based on review feedback