more formatting and minor changes