Edit auth and some refactoring code