Stylistic & naming cleanup.