Refactoring. Simplified.