replacing instance variables
Merge pull request #2350 from opf/feature/access_control_refactor

replacing instance variables