Little by little add const where possible