Some clean-up and style changes
4 files changed