Added some modifiers, per code review comments.