- more improvements based on review feedback