Refactoring for SQLI