stylistic cleanups