added a few const modifiers