More code changes based on review