cosmetics.
code simplifications.