Low hanging fruits

some minor things while looking through the code... should not break anything ,-)