* reduce scope
* doxy warnings
* coding guidelines ', '