Some aesthetic cleanups