Latest round of style edits