Improve comments/docs