formatting and other minor changes