code tweaks and simplifications.
code tweak.
code cleanups.
tweaked code.