some markup cleanups