* fix possible bug
* more codestyle improvements