Refactoring && add syntax configuration