cleanup and standardize
4 files changed