Cleaned up service stuff