removing more brace initializers