Authorization model small code fix
Small global refactoring