Refactored fade calculations