AA and refactoring