Code cleaned and follow Dart SDK 0.2.10.1_r16761.