Minor cleanup

6 files changed