Duplication code was eliminated