Minor fixes

* Removed unused includes.
* Shortened long lines.
* Clarified documentation.