* removed todo
* renamed member var
* doxy + comments