minor code tweaks.
minor code tweaks.