Primarily formatting, exception raising, and documentation changes.