Fixed Syntax and programming style