Few refactorings.

Improved equip / unequip output.