Fix syntax highlighting and remove trailing spaces