cleanup and format
159 files changed