More Conforming to Dart Style Guide