Add missing const, adjust to coding convention