Removed sanitizer class.
Smaller optimizaions, mainly parameter names and comments.