Improve documentation and type/field names