remove curly from syntax
removing curly
clean up
Changes from upstream