Improved const correctness