Syntax changes and Code Cleaning