feism refactor