Refactored - separated item