Removed wrapping
Syntax fixes