Stylistic cleanups