Minor polishing here and there