Formatting and clean up of some files
6 files changed