More formatting and minor changes