More {} and Utils/Util standardisation.