Refactor paradigms