Be meaningful when turning off/on syntax errors
Minor refactoring