Refactoring with Armature