Improving docs and object names