Cleanup. Syntax errors, re-aligned, re-tabbed