* Minor polishing