some non-functional tweaks