More idiomatic dart
Merged