Performance improvements and come stylistic adjustments.