Code cleaned and follow Dart SDK 0.3.1.1_r17328.