Formatting and minor stuff.