Armada - Refactoring