Some code cleanups
6 files changed