Removed the repeating sms test. Cleanup of Service field declarations.
Added some comments.