Bringing up to date before a style cleanup