polishing & cleanups