Minor code cleanup
5 files changed