Minor changes based on review comments