Minor changes and reformatting