Improve comments.
Simplify property name.