Improve const correctness