Cleaned up codes for sanitzers