Syntax corrected, code cleaned