- improvements based on review comments