Need a note: please **avoid** broad cosmetic/style changes which increase merge conflicts