chg: syntax simplification
Merge pull request #636 from mmklee/syntax

chg: syntax simplification