Stylistic clean up