Chores/refactor suggestions