Cleaned up service