minor cleanup
4 files changed