more const correcting