Code tweaks

cosmetics