constify and polish