SWC-449 clean up code in widget editors