Refactor ank