Readability and syntax fixes.