minor code tweaks, no change in behavior