[#204] Improve readability

* Add comments
* Use more meaningful names