minor cleanup
33 files changed