refactoring: simplified authorization