Cleanup of QA and separation of concerns.