General minor cleanup for easier readability.