Cleaned up health code