* Small cleanup
* code checked with cppcheck but no errors found.