More cleaning up and polishing