Refactored readability