updated const correctness