some refactoring and devise route after signin"