"const" added where possible