[QA] - Added suggestions by @Sara_t