polishing and cleanups