Minor documentation and better naming