minor changes and formatting