Stylistic clean up.