evil refactor