Add a couple more comments
Drop the redundant field name

Towards #25.