improvements based on review