More styling and cleanup.