Fix #1797 and make code more readable
- Avoid condition being occurring 3 times: col name, value, setter.
- Put condition, col name, and value together.
Fix: just delete table in the current schema
Minor: improve code readability