cleanup and format
12 files changed