More use of initializer list