DEV: const-correctness