REFACTOR - Class