Some minor syntax changes
Some minor syntax changes