Feature/pdsc 4 refactor ui code harvest

Same break the method into more logical group.