style and convention edits