Refactor ames.
Ames refactor complete.