improve comments
improve comments
improvements based on review comments