Refactor classe hunt