Sanitize user input
Cleaning up code