cleanup and formatting
3 files changed