minor stylistic cleanups