some formatting and minor changes