* Small code improvements
* Code documentation