code cleanup/updates
18 files changed