Minor cosmetic fixes and code cleanup.