Style fixes, comments, cleanup.