Fix syntax errors.
Improve whitespace.