more tweaks

php "mess detector" inspired tweaks