diff --git a/lib/game/components/multiballs/behaviors/multiballs_behavior.dart b/lib/game/components/multiballs/behaviors/multiballs_behavior.dart
index f68f4bbd..c9d7609f 100644
--- a/lib/game/components/multiballs/behaviors/multiballs_behavior.dart
+++ b/lib/game/components/multiballs/behaviors/multiballs_behavior.dart
@@ -10,11 +10,11 @@ class MultiballsBehavior extends Component
   void onMount() {
     super.onMount();
 
-    int _previousMultiballBonus = 0;
+    var _previousMultiballBonus = 0;
 
     gameRef.read<GameBloc>().stream.listen((state) {
       // TODO(ruimiguel): only when state.bonusHistory dashNest has changed
-      var multiballBonus = state.bonusHistory.fold<int>(
+      final multiballBonus = state.bonusHistory.fold<int>(
         0,
         (previousValue, bonus) {
           if (bonus == GameBonus.dashNest) {
diff --git a/packages/pinball_components/lib/src/components/multiball/behaviors/multiball_blinking_behavior.dart b/packages/pinball_components/lib/src/components/multiball/behaviors/multiball_blinking_behavior.dart
index e32c04f9..99f51f6a 100644
--- a/packages/pinball_components/lib/src/components/multiball/behaviors/multiball_blinking_behavior.dart
+++ b/packages/pinball_components/lib/src/components/multiball/behaviors/multiball_blinking_behavior.dart
@@ -21,10 +21,11 @@ class MultiballBlinkingBehavior extends Component with ParentIsA<Multiball> {
     }
   }
 
-  void _animate() async {
+  // TODO(ruimiguel): try to improve with TimerComponent?
+  Future<void> _animate() async {
     if (!_isAnimating) {
       _isAnimating = true;
-      for (var i = 0; i < 5; i++) {
+      for (var i = 0; i < _maxBlinks; i++) {
         parent.bloc.onBlink();
         await Future<void>.delayed(
           const Duration(milliseconds: 100),
diff --git a/packages/pinball_components/lib/src/components/multiball/cubit/multiball_cubit.dart b/packages/pinball_components/lib/src/components/multiball/cubit/multiball_cubit.dart
index ceb2271f..de1f082a 100644
--- a/packages/pinball_components/lib/src/components/multiball/cubit/multiball_cubit.dart
+++ b/packages/pinball_components/lib/src/components/multiball/cubit/multiball_cubit.dart
@@ -6,7 +6,7 @@ import 'package:equatable/equatable.dart';
 part 'multiball_state.dart';
 
 class MultiballCubit extends Cubit<MultiballState> {
-  MultiballCubit() : super(MultiballState.initial());
+  MultiballCubit() : super(const MultiballState.initial());
 
   void onAnimate() {
     emit(