standardize and cleanup
4 files changed