Fixing wrong syntax and using beautifier