Refactored to a single line