Further changes based on review feedback