Eliminate duplicated code by re-using wp_widget_control

Remove code specific to widget addition since not yet available
Cleanup dead code
Apply phpcs formatting fixes