Armada - code reworking

All functionality is the same, just some code has been reworked to
reduce some inefficiency.