Code Syntax clean up