Strictly formatting cleanup