more style and structure edits