[QA] - Applied suggestions by @Sara_t