General cleanup and polishing.