Code cleanup: const correctness