Removing a TODO that is not required to resolve.
Bug fix, removing extra braces around sync-code