first pass at const cleanup