Refactor syntax and modeling