make more const