Refine implementation per review comments