Formatting and minor changes