Tweaks to the SAS service
Significant code cleanup