ARMORY-125 - Improvements for armoryd

Miscellaneous minor code cleanup and comment improvement.