Refactor and armor