Formatting and minor stuff