More code cleaning

* docstring for a few more analysis
* less obfuscated code