Refactor-3: reads much better (line 39)