Refactored OAuth-class