diff --git a/src/academicyears/academicyears.service.ts b/src/academicyears/academicyears.service.ts
index 87f4e009..ed138601 100644
--- a/src/academicyears/academicyears.service.ts
+++ b/src/academicyears/academicyears.service.ts
@@ -167,7 +167,7 @@ export class AcademicYearService {
   async getAcademicYearById(id, response) {
     const apiId = APIID.ACADEMICYEAR_GET;
     try {
-      const academicYearResult = await this.academicYearRespository.findOne({ where: { id: id } });
+      const academicYearResult = await this.academicYearRespository.findOne({ where: { id } });
       if (!academicYearResult) {
         return APIResponse.error(
           response,
diff --git a/src/authRbac/authRbac.controller.ts b/src/authRbac/authRbac.controller.ts
index dec8b29e..092270c0 100644
--- a/src/authRbac/authRbac.controller.ts
+++ b/src/authRbac/authRbac.controller.ts
@@ -24,7 +24,7 @@ export class AuthRbacController {
   @ApiHeader({
     name: "tenantid",
     required: true,
-    description: "Tenant Id",
+    description: "Tenant ID",
   })
   @ApiBasicAuth("access-token")
   @UseGuards(JwtAuthGuard)
diff --git a/src/cohort/cohort.service.ts b/src/cohort/cohort.service.ts
index e9aa53ac..4cb71e0a 100644
--- a/src/cohort/cohort.service.ts
+++ b/src/cohort/cohort.service.ts
@@ -1049,7 +1049,7 @@ export class CohortService {
         return APIResponse.error(
           response,
           apiId,
-          `Invalid Cohort Id format. It must be a valid UUID`,
+          `Invalid Cohort ID format. It must be a valid UUID`,
           "Invalid cohortId",
           HttpStatus.BAD_REQUEST
         );
diff --git a/src/location/location.service.ts b/src/location/location.service.ts
index 704e3bdf..96ac8afd 100644
--- a/src/location/location.service.ts
+++ b/src/location/location.service.ts
@@ -44,7 +44,7 @@ export class LocationService {
     const apiId = "api.find.location";
     try {
       const location = await this.locationRepository.find({
-        where: { id: id },
+        where: { id },
       });
       if (!location) {
         return APIResponse.error(
@@ -82,7 +82,7 @@ export class LocationService {
     const apiId = "api.update.location";
     try {
       const location = await this.locationRepository.find({
-        where: { id: id },
+        where: { id },
       });
       if (!location) {
         return APIResponse.error(
@@ -117,7 +117,7 @@ export class LocationService {
     const apiId = "api.delete.location";
     try {
       const location = await this.locationRepository.find({
-        where: { id: id },
+        where: { id },
       });
       if (!location) {
         return APIResponse.error(