- qa: refactoring