Code tweaks & simplifications