minor changes and reformatting