minor readability cleanups