Refactored to single line