Refactoring Amistad.