Aws side code quality
This MR will improve AWS code quality, fix some codesmell
Community will be down this weekend for data migration in preparation for GitLab 17.0. Work will start at 10pm UTC (5pm CDT, 3:30am IST) and is expected to run through Sunday.
This MR will improve AWS code quality, fix some codesmell