Refactored omniauth methods some more