cleanup and format
2 files changed