refacorting and guardian details