Refactoring and Authentication