Cleaned up the initialization of the Service class