Refactoring, authentication