Changed raw for sanitize
Refactored comments