Mostly naming, formatting, and code style changes