Sanitized code a little bit