Fix syntax and style