Refactor and Red for update Hans