quality cleanups