post-post-final. tiny cosmetic cleanups