Minor code cleanup
3 files changed