Fix formatting, class names, whitespace.
Add FIXME comments for some remaining problems.