Armada - Some code refactoring