clean-up and progress to have localized graph elements