Syntax fixes
Revert "Syntax fixes"

This reverts commit 93432f912a53e277429fbf638c424cc2f326e361.
Fixing merge