Documented code
Changed type name
Solved merge conflict