add const qualify where appropriate