Comments and polish