Stylistic cleanups from review