removing graft
restructure for cohesion