Minor code clean-up
6 files changed