diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index df278b0..eb5d69f 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,29 +1,21 @@
+import { HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
-import { HttpClientModule } from '@angular/common/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NgxMatDatetimePickerModule } from '@angular-material-components/datetime-picker';
-
 import { AppComponent } from './app.component';
+import { AuthConfigModule } from './auth/auth-config.module';
 import { MaterialModule } from './material/material.module';
-import { MatGridListModule } from '@angular/material/grid-list';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-import {MatListModule} from '@angular/material/list'; 
-import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
-
-import { HomeComponent } from './pages/home/home.component';
-import { TravelComponent } from './pages/travel/travel.component';
 import { EditTravelComponent } from './pages/edit-travel/edit-travel.component';
-
+import { HomeComponent } from './pages/home/home.component';
+import { NewTravelComponent } from './pages/new-travel/new-travel.component';
+import { TravelComponent } from './pages/travel/travel.component';
+import { AvailablePlacesPipe } from './pipes/available-places.pipe';
+import { AppRouterModule } from './router.module';
+import { ChatComponent } from './views/chat/chat.component';
 import { HeaderComponent } from './views/header/header.component';
 import { ListComponent } from './views/list/list.component';
 import { TravelFormComponent } from './views/travel-form/travel-form.component';
-import { NewTravelComponent } from './pages/new-travel/new-travel.component';
-import { AppRouterModule } from './router.module';
-import { AvailablePlacesPipe } from './pipes/available-places.pipe';
-import { AuthConfigModule } from './auth/auth-config.module';
-import { ChatComponent } from './views/chat/chat.component';
 
 @NgModule({
   imports: [
@@ -34,11 +26,6 @@ import { ChatComponent } from './views/chat/chat.component';
     BrowserAnimationsModule,
     AppRouterModule,
     MaterialModule,
-    MatListModule,
-    MatGridListModule,
-    MatDatepickerModule,
-    NgxMatDatetimePickerModule,
-    NgxMatMomentModule,
     AuthConfigModule
   ],
   declarations: [
@@ -53,12 +40,6 @@ import { ChatComponent } from './views/chat/chat.component';
     AvailablePlacesPipe,
     ChatComponent
   ],
-  providers: [
-    // (useHash) ? { provide: LocationStrategy, useClass: HashLocationStrategy } : [],
-    // {provide: AuthConfig, useValue: authConfig },
-    // { provide: OAuthStorage, useValue: localStorage },
-    // { provide: ValidationHandler, useClass: JwksValidationHandler },
-  ],
   bootstrap: [AppComponent],
 })
 export class AppModule { }
diff --git a/src/app/material/material.module.ts b/src/app/material/material.module.ts
index 8903195..adafbeb 100644
--- a/src/app/material/material.module.ts
+++ b/src/app/material/material.module.ts
@@ -10,6 +10,9 @@ import { MatSortModule } from '@angular/material/sort';
 import { MatInputModule } from '@angular/material/input';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatListModule } from '@angular/material/list';
+import { NgxMatDatetimePickerModule } from '@angular-material-components/datetime-picker';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
 
 
 @NgModule({
@@ -24,6 +27,11 @@ import { MatDatepickerModule } from '@angular/material/datepicker';
     MatPaginatorModule,
     MatSortModule,
     MatDatepickerModule,
+    MatListModule,
+    MatGridListModule,
+    MatDatepickerModule,
+    NgxMatDatetimePickerModule,
+    NgxMatMomentModule,
     MatProgressSpinnerModule
   ],
   exports: [
@@ -36,6 +44,11 @@ import { MatDatepickerModule } from '@angular/material/datepicker';
     MatPaginatorModule,
     MatSortModule,
     MatDatepickerModule,
+    MatListModule,
+    MatGridListModule,
+    MatDatepickerModule,
+    NgxMatDatetimePickerModule,
+    NgxMatMomentModule,
     MatProgressSpinnerModule
   ]
 })
diff --git a/src/app/services/chat-message-handler.ts b/src/app/services/chat-message-handler.ts
index 8e19047..b901e5d 100644
--- a/src/app/services/chat-message-handler.ts
+++ b/src/app/services/chat-message-handler.ts
@@ -9,7 +9,7 @@ export class ChatMessageHandler {
         private matrixClientPromise: Promise<MatrixClient>,
     ) { }
 
-    getRoomMessages = (roomId: string) => {
+    getRoomMessages = (roomId: string): Subject<MatrixEvent> => {
         const subject = new Subject<MatrixEvent>();
 
         this.publishRoomOldMessages(roomId, subject);