Scatter Plot face lift :massage: to be consistent with other form that has independent/dependent inputs
Refactoring and cleaning up unused codes