- ready for Dart 1.0
- some reformatting