Syntax and Declarations fixed