Refactored to reduce line length