added more appropriate const modifiers