Cleaned up health check