some const cleanup