Sanitization
Code cleanup