refactor
remove old code
rename 'json-holder' to 'data-holder'