Some small syntax changes
Reflect syntax changes