More cleanup and straightening
4 files changed