Refactored news