Chore refactored