diff --git a/lib/core/utils/pref_utils.dart b/lib/core/utils/pref_utils.dart
index 5a7f1b98..5238073f 100644
--- a/lib/core/utils/pref_utils.dart
+++ b/lib/core/utils/pref_utils.dart
@@ -1,7 +1,5 @@
 //ignore: unused_import
 import 'dart:convert';
-import 'dart:ui';
-import 'package:flutter/scheduler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class PrefUtils {
diff --git a/lib/presentation/additional_information_screen/models/additional_information_model.dart b/lib/presentation/additional_information_screen/models/additional_information_model.dart
index bc31be45..3eccd2a0 100644
--- a/lib/presentation/additional_information_screen/models/additional_information_model.dart
+++ b/lib/presentation/additional_information_screen/models/additional_information_model.dart
@@ -5,7 +5,7 @@ import 'package:equatable/equatable.dart';
 /// This class defines the variables used in the [additional_information_screen],
 /// and is typically used to hold data that is passed between different parts of the application.
 class AdditionalInformationModel extends Equatable {
-  AdditionalInformationModel() {}
+  AdditionalInformationModel();
 
   AdditionalInformationModel copyWith() {
     return AdditionalInformationModel();
diff --git a/lib/presentation/allergies_screen/models/allergies_model.dart b/lib/presentation/allergies_screen/models/allergies_model.dart
index 64649efe..4ba134a3 100644
--- a/lib/presentation/allergies_screen/models/allergies_model.dart
+++ b/lib/presentation/allergies_screen/models/allergies_model.dart
@@ -5,7 +5,7 @@ import 'package:equatable/equatable.dart';
 /// This class defines the variables used in the [allergies_screen],
 /// and is typically used to hold data that is passed between different parts of the application.
 class AllergiesModel extends Equatable {
-  AllergiesModel() {}
+  AllergiesModel();
 
   AllergiesModel copyWith() {
     return AllergiesModel();
diff --git a/lib/presentation/app_navigation_screen/models/app_navigation_model.dart b/lib/presentation/app_navigation_screen/models/app_navigation_model.dart
index 405bdc8a..73fd71d7 100644
--- a/lib/presentation/app_navigation_screen/models/app_navigation_model.dart
+++ b/lib/presentation/app_navigation_screen/models/app_navigation_model.dart
@@ -5,7 +5,7 @@ import 'package:equatable/equatable.dart';
 /// This class defines the variables used in the [app_navigation_screen],
 /// and is typically used to hold data that is passed between different parts of the application.
 class AppNavigationModel extends Equatable {
-  AppNavigationModel() {}
+  AppNavigationModel();
 
   AppNavigationModel copyWith() {
     return AppNavigationModel();
diff --git a/lib/presentation/gender_screen/bloc/gender_bloc.dart b/lib/presentation/gender_screen/bloc/gender_bloc.dart
index 112cab6e..7a2d4092 100644
--- a/lib/presentation/gender_screen/bloc/gender_bloc.dart
+++ b/lib/presentation/gender_screen/bloc/gender_bloc.dart
@@ -9,7 +9,7 @@ part 'gender_state.dart';
 class GenderBloc extends Bloc<GenderEvent, GenderState> {
   GenderBloc(GenderState initialState) : super(initialState) {
     on<GenderInitialEvent>(_onInitialize);
-    on<GenderSelectEvent>(_GenderSelect);
+    on<GenderSelectEvent>(_genderSelect);
   }
 
   _onInitialize(
@@ -19,7 +19,7 @@ class GenderBloc extends Bloc<GenderEvent, GenderState> {
     emit(state.copyWith(genderModelObj: state.genderModelObj));
   }
 
-  _GenderSelect(
+  _genderSelect(
     GenderSelectEvent event,
     Emitter<GenderState> emit,
   ) {
diff --git a/lib/presentation/height_screen/models/height_model.dart b/lib/presentation/height_screen/models/height_model.dart
index 0a9a4448..e2f18217 100644
--- a/lib/presentation/height_screen/models/height_model.dart
+++ b/lib/presentation/height_screen/models/height_model.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model
 /// This class defines the variables used in the [height_screen],
 /// and is typically used to hold data that is passed between different parts of the application.
 class HeightModel extends Equatable {
-  HeightModel({this.dropdownItemList = const []}) {}
+  HeightModel({this.dropdownItemList = const []});
 
   List<SelectionPopupModel> dropdownItemList;
 
diff --git a/lib/presentation/language_select_screen/language_select_screen.dart b/lib/presentation/language_select_screen/language_select_screen.dart
index 44166da8..9bae529d 100644
--- a/lib/presentation/language_select_screen/language_select_screen.dart
+++ b/lib/presentation/language_select_screen/language_select_screen.dart
@@ -1,5 +1,4 @@
 import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
-import 'package:eatvio_app/presentation/credentials_screen/credentials_screen.dart';
 
 import 'bloc/language_select_bloc.dart';
 import 'models/language_select_model.dart';
diff --git a/lib/presentation/language_select_screen/models/language_select_model.dart b/lib/presentation/language_select_screen/models/language_select_model.dart
index c19faa3f..1df7f8aa 100644
--- a/lib/presentation/language_select_screen/models/language_select_model.dart
+++ b/lib/presentation/language_select_screen/models/language_select_model.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model
 /// This class defines the variables used in the [language_select_screen],
 /// and is typically used to hold data that is passed between different parts of the application.
 class LanguageSelectModel extends Equatable {
-  LanguageSelectModel({this.dropdownItemList = const []}) {}
+  LanguageSelectModel({this.dropdownItemList = const []});
   UserRegistrationSheet userRegistrationSheet = UserRegistrationSheet(
     firstName: '',
     lastName: '',
diff --git a/lib/presentation/medicine_intake_screen/models/medicine_intake_model.dart b/lib/presentation/medicine_intake_screen/models/medicine_intake_model.dart
index 29323f2d..5a095de4 100644
--- a/lib/presentation/medicine_intake_screen/models/medicine_intake_model.dart
+++ b/lib/presentation/medicine_intake_screen/models/medicine_intake_model.dart
@@ -5,7 +5,7 @@ import 'package:equatable/equatable.dart';
 /// This class defines the variables used in the [medicine_intake_screen],
 /// and is typically used to hold data that is passed between different parts of the application.
 class MedicineIntakeModel extends Equatable {
-  MedicineIntakeModel() {}
+  MedicineIntakeModel();
 
   MedicineIntakeModel copyWith() {
     return MedicineIntakeModel();
diff --git a/lib/presentation/splash_screen/models/splash_model.dart b/lib/presentation/splash_screen/models/splash_model.dart
index a2d44d6c..6ad8f8f1 100644
--- a/lib/presentation/splash_screen/models/splash_model.dart
+++ b/lib/presentation/splash_screen/models/splash_model.dart
@@ -5,7 +5,7 @@ import 'package:equatable/equatable.dart';
 /// This class defines the variables used in the [splash_screen],
 /// and is typically used to hold data that is passed between different parts of the application.
 class SplashModel extends Equatable {
-  SplashModel() {}
+  SplashModel();
 
   SplashModel copyWith() {
     return SplashModel();
diff --git a/lib/presentation/weight_screen/models/weight_model.dart b/lib/presentation/weight_screen/models/weight_model.dart
index 1ebdb828..b4957007 100644
--- a/lib/presentation/weight_screen/models/weight_model.dart
+++ b/lib/presentation/weight_screen/models/weight_model.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model
 /// This class defines the variables used in the [weight_screen],
 /// and is typically used to hold data that is passed between different parts of the application.
 class WeightModel extends Equatable {
-  WeightModel({this.dropdownItemList = const []}) {}
+  WeightModel({this.dropdownItemList = const []});
 
   List<SelectionPopupModel> dropdownItemList;
 
diff --git a/lib/theme/theme_helper.dart b/lib/theme/theme_helper.dart
index db1b9984..e7fb2e95 100644
--- a/lib/theme/theme_helper.dart
+++ b/lib/theme/theme_helper.dart
@@ -1,4 +1,3 @@
-import 'dart:ui';
 import 'package:flutter/material.dart';
 import '../../core/app_export.dart';