Refactor syntax forms