Refactor to better match use case description