Improved const correctness
Improved const correctness