Polishing.
Merged edit by JD