* reduce scope
* doxy warnings
* cppcheck warnings