Style fixes, some code cleanup.