Small changes and formatting