Refactored more red