SQL refactor