design clean-up
30 files changed