Use more const