Minor stylistic cleanups