Refactoring AF.