mostly style edits