Minor fixes and visual cleanup.