Refactoring.
Fixed syntax parser issue.