Minor changes and formatting