Cleanup comments.
Add path property.