cosmetics and pre-increment
fixes catkin_lint notices