Refactoring fixes based on code review [KFSQA-1029]