standardize and cleanup
2 files changed