more const correctness