small cleanups

by cppcheck and astyle.