Some code simplifications.
6 files changed