Refactor scatter widget method
Merge pull request #276 from ChrisBeaumont/scatter-cleanup

Refactor scatter widget method