more visual cleanups