Formatting and minor update