Mostly clean-up and style changes