ARMORY-125 - Improvements for armoryd

Minor code and comment cleanup.