Clean up signal source auxiliary function that it is ostensibly unneeded
Clean up redundant code; reorder things nicely