So refactor