Minor code cleanup
24 files changed