Rebrace and remove &