Update backend client for frontend
Clean up code